Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Mar 2012 19:51:39 +0000 (12:51 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Mar 2012 19:51:39 +0000 (12:51 -0700)
commitec60973589ca5d22a53ef07381d85f628145fcca
tree06a1bc902edcea864204df31f04aa1ab289fa36f
parentfe6322b8ea0ebb8e5f0c2dc3328fcd434a016417
parent134c1c68d74132d675b19e0a1ba69fdb78252cd8
Merge from trunk.